Add timeout handling for S3 blob container async operations#18583
Merged
ashking94 merged 3 commits intoopensearch-project:mainfrom Jun 24, 2025
Merged
Add timeout handling for S3 blob container async operations#18583ashking94 merged 3 commits intoopensearch-project:mainfrom
ashking94 merged 3 commits intoopensearch-project:mainfrom
Conversation
ashking94
requested review from
a team,
Bukhtawar,
CEHENKLE,
Rishikesh1159,
VachaShah,
anasalkouz,
andrross,
cwperks,
dbwiddis,
gbbafna,
jed326,
kotwanikunal,
mch2,
msfroh,
owaiskazi19,
reta,
sachinpkale,
saratvemulapalli,
shwetathareja and
sohami
as code owners
ashking94
changed the title
ashking94
added
skip-changelog
backport 2.x
Contributor
|
❕ Gradle check result for 805f91b: UNSTABLE Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #18583 +/- ##
============================================
- Coverage 72.76% 72.65% -0.11%
+ Complexity 68167 68117 -50
============================================
Files 5541 5541
Lines 313426 313462 +36
Branches 45479 45479
============================================
- Hits 228062 227748 -314
- Misses 66709 67165 +456
+ Partials 18655 18549 -106 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Member
Author
|
Planning to add some more logs to be able to debug better. |
Contributor
|
❌ Gradle check result for 1ff0fff: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
Signed-off-by: Ashish Singh <ssashish@amazon.com>
Contributor
|
❕ Gradle check result for 67e653b: UNSTABLE Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
andrross
approved these changes
Jun 23, 2025
...ns/repository-s3/src/main/java/org/opensearch/repositories/s3/async/S3AsyncDeleteHelper.java
Outdated
Show resolved
Hide resolved
...ns/repository-s3/src/main/java/org/opensearch/repositories/s3/async/S3AsyncDeleteHelper.java
Show resolved
Hide resolved
Signed-off-by: Ashish Singh <ssashish@amazon.com>
gbbafna
approved these changes
Jun 24, 2025
Contributor
github-project-automation
bot
moved this from 👀 In review
to ✅ Done
in Storage Project Board
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jun 24, 2025
* Add timeout handling for S3 blob container async operations Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add logs to debug never completing future Signed-off-by: Ashish Singh <ssashish@amazon.com> * Incorporare PR review comments Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> (cherry picked from commit 2581c58) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jun 24, 2025
* Add timeout handling for S3 blob container async operations Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add logs to debug never completing future Signed-off-by: Ashish Singh <ssashish@amazon.com> * Incorporare PR review comments Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com> (cherry picked from commit 2581c58) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ashking94
pushed a commit
that referenced
this pull request
Jun 24, 2025
…18596) * Add timeout handling for S3 blob container async operations * Add logs to debug never completing future * Incorporare PR review comments --------- (cherry picked from commit 2581c58) Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
neuenfeldttj
pushed a commit
to neuenfeldttj/OpenSearch
that referenced
this pull request
Jun 26, 2025
…ch-project#18583) * Add timeout handling for S3 blob container async operations Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add logs to debug never completing future Signed-off-by: Ashish Singh <ssashish@amazon.com> * Incorporare PR review comments Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>Signed-off-by: TJ Neuenfeldt <tjneu@amazon.com>
neuenfeldttj
pushed a commit
to neuenfeldttj/OpenSearch
that referenced
this pull request
Jun 26, 2025
…ch-project#18583) * Add timeout handling for S3 blob container async operations Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add logs to debug never completing future Signed-off-by: Ashish Singh <ssashish@amazon.com> * Incorporare PR review comments Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
tandonks
pushed a commit
to tandonks/OpenSearch
that referenced
this pull request
Aug 5, 2025
…ch-project#18583) * Add timeout handling for S3 blob container async operations Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add logs to debug never completing future Signed-off-by: Ashish Singh <ssashish@amazon.com> * Incorporare PR review comments Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds timeout handling for async operations in the S3 blob container to prevent snapshot deletion threads from getting stuck indefinitely. Previously, when S3 operations would hang or never complete, the snapshot deletion threadpool could get stuck with non-zero active thread count.
The change can be summarised as below -
getFutureValue()testDeleteTimeoutWithNeverCompletingAsyncDeletionFutureto verify timeout behaviorRelated Issues
Resolves #18314
Check List
[ ] API changes companion pull request created, if applicable.[ ] Public documentation issue/PR created, if applicable.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.